Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 03:45:51 PDT 2014