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