Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 04:19:41 PDT 2014