Sync'd branch integration/b2g-inbound with upstream @ Sun Sep 21 18:13:42 PDT 2014