Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 13:29:27 PDT 2014