Sync'd branch integration/b2g-inbound with upstream @ Sun Sep 21 23:08:38 PDT 2014