Merge branch 'master' into carousel_indicators_ie

This commit is contained in:
Mark Otto 2013-10-20 16:53:57 -07:00
commit 5e70642dd2

File diff suppressed because one or more lines are too long