Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 26 19:20:43 PDT 2014