Sync'd branch integration/b2g-inbound with upstream @ Sun Sep 21 22:33:41 PDT 2014