Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 09:48:39 PDT 2014