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