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