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