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