Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 20 14:38:39 PDT 2014