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