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