Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 00:33:43 PDT 2014