Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 07:49:39 PDT 2014